From addd7afd98d807f7f6885b8b815ba897e7186f41 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Wed, 8 Feb 2006 15:58:01 +0000 Subject: [PATCH] Add m2p translation to read_cr3 on x86_64. From: Jan Beulich From: Nakajima, Jun Signed-off-by: Christian Limpach --- .../include/asm-x86_64/mach-xen/asm/system.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h index 7520d06eac..6a29a815f0 100644 --- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h +++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h @@ -179,12 +179,11 @@ static inline void write_cr0(unsigned long val) asm volatile("movq %0,%%cr0" :: "r" (val)); } -static inline unsigned long read_cr3(void) -{ - unsigned long cr3; - asm("movq %%cr3,%0" : "=r" (cr3)); - return cr3; -} +#define read_cr3() ({ \ + unsigned long __dummy; \ + asm("movq %%cr3,%0" : "=r" (__dummy)); \ + return machine_to_phys(__dummy); \ +}) static inline unsigned long read_cr4(void) { -- 2.30.2